More formatting cleanups.