Let "make format" have its wicked way with the new code