Mostly style 'improvements'.