fixup! Cleanup diagrams and match statement