Formatting fix
Decl formatting fix
Re-indent
Format, again
Some alter_table tests should pass