Some minor tweaks to make @joshk happy.