Update statement generation

It should generate statements that can be displayed like this:
![statement](https://cloud.githubusercontent.com/assets/1731223/5044294/c63c2cd2-6bf7-11e4-9b84-8f98883fe53b.png)




Woops. Tx for cleaning this up.