Rewrote whitespace parser.