Formatting tweaks.
Tweak to fix failing test.