Switch to non-deprecated avoption getters/setters