Minor whitespace tweaks. See #1217, #1218.