More misc code cleanups.