Some more small cleanup for metaclasses