Preserve whitespace in arguments.
Minor tweaks.