Many more fixes from the infobox cleanup fallout.