Post-collar fixes in prep for 112a patch.