hyperswitch

fe3cf547 - chore: nits and small code improvements found during investigation of PR#3168 (#3259)