Write more tests and reorganize a bit to follow the grammar.