Adjust to get the new style working properly in python2.7

Mostly a matter of adjusting method resolution order.