Accumulating over time until the 3.1 APIs get fixed.
I agree it's better not to delay these changes too much.