Whitespace tweaks to make tests happy