Incremental checkin with a few cleanups.