Remove some remaining version-switching nuggets.