Thanks for the patches, I've pushed these to master as
e25352a0c34433c4fe8529bbc5cdca1757c57e22.

Chris