Changes to v1where.

- Changed parser.
- Added test.