Get rid of old-style classes

A Hacking rule is on the way.

Change-Id: If254c86649d7deadfb47f7dba31dd1adf7cf7fa0
Merge "Get rid of old-style classes"