Remaining changes related to deprecated API usage.
Reviewed by: Waleri Enns