I guess this stuff needs to be switched over to the `getattr` style stuff now. Actually, it would be perfect if you could `git pull upstream develop` into this branch and resolve the merge conflict, then push it up to bring those changes into this pull request (and allow for an auto-resolve of the pull request later). If that makes sense?