Add comments when making statements compound
Change tests so that they're "indent"ed using GNU indent - don't particularly like the indenting, but having both the originals and the annotated versions having a consistent style of indentation means that diffing them is far easier.