Further small cleanups