Bring jbevain/cecil's commit fb8dcbabcfbb611faeb47f1db53d54022ead2551, style fixes