Adhere to / circumvent stricter 2.11 variance checks

From the be-careful-what-you-wish-for department.

Review by @larsrh / @S11001001