Small cleanups from kev's review