@malcolmsparks: that’s what I ended up doing. I thought this would then complicate matching (and it does in a way) but I can just write a match-for that contains my custom logic as well. I guess I was looking too much for something built-in instead of extending myself. Pleasure to work with bidi so far. Takes a while to get out of compojure-thinking but awesome after that! 