ad63bc4 Simplify class registration.