2013-10-05-16.20.57: General prettyprinter tidying and modernizing.