Added reference to code style spec
Made token selection work correctly with no intervening spaces between
tokens.
Another test passes.