32 upstream updates

@monfresh Adds some style updates and fixes from upstream. Commits shouldn't be squashed because each of these is a distinct edit/fix.