Follow-up to r57949: whitespace tweaks