Thanks for the patches, I've adjusted some of the indentation and pushed
these to master as a558998f7dabb2c0672abe3aaac89fb9b652cbb1.

Chris