QuickFix: header definition
Use map of joint names instead of case expression