Random whitespace/cosmetic/consistency fixes.