Refactored some common whitespace-parsing code in scanning both scalars. Implemented the flow collection tokens.
Fixed some of the whitespace/line break matching.