Merging whitespaces.
Additional lexer test cases.
Fix axis support in queries.