More tweaks to 908a4f6.