Minor changes to improve patch-ability.