More auto-reformat fixing; code should parse now