More minor code mods.