More code style updates, to suppress intentional code styles