Ensure switch-case is exhaustive
Fix match macro interacting with hyginenic macros