This change was also related to the class/object stuff. Basically, look at the diff of this file on GitHub -- a lot of the changes from 2.10 seem to be due to my edits and not due to the 2.9 -> 2.10 upgrade.