Fix the two cases of us using old-style classes on Python 2.