Minor code motion.