I've now gone ahead and pushed these two patches [1]. Thanks for taking
a look :)

1: As 9c5f4b82bb0ed6a0447a68f9cb18c4da5f692acf and
9c5f4b82bb0ed6a0447a68f9cb18c4da5f692acf