Fix: Cleanup awkward type validation logic.