Misc. style updates and fixes from elsewhere