Whitespace/formatting fixes, a few more typeof changes