Adhere to stricter 2.11 variance checks: 7.1

#596 for 7.1, with fewer bits due to the distinct lack of variance throughout the 7.1 API.