A few more refactoring tweaks.