Bring jbevain/cecil's commit abbedab2d7b215ee94c5eab894d86d010d105de6, style fix