gv_magicalize: Essentially white space

This indents things to nicely align vertically and moves some braces in
the process

Author: khwilliamson