unfuddle commit. cleanups.