> ... this makes me wonder if I get this right and only add the first pop if there is a catch. I'll have to double check that.

Duh, that is exactly what this branch is about.