More formatting changes, dammit.