More work on generation/parsing.
More work on generation/parsing.