Further small cleanups.