Further tweaks to whitespace idea per #postgresql