Whitespace changes to reduce diff with Hannon Hill master