Sorry! You're right, I should have been more vigilant, and thought it was a straightforward change. Apparently deprecations aren't as straightforward as that.