Edits relating to whitespace handling.