Format more syntax

This astyle run should cover the rest of the files that needed it.