A few more coding style changes before handing over front-end to timcowlishaw