Some additional (minor) cleanups.