Fixes more small nits with #5153

Hopefully fixes all the indentation issues VS2012 gave me.