Futzing with the new class hierarchy.