Bring jbevain/cecil's commit 7d9999c60bd538a19a84f1211064ef104f07ee82, Fix writing...