More code-generation and more parsing code