Misc cleanup. No code changes. Carry on.