Fix a few remaining references to 1.9 logic.