Address whitespace concerns.