Add missing scenario description
Tweak @tooky's refactoring

I like this pattern of passing args along with the visitor, so
I generalised it a bit. I am wondering whether this could also be
useful when walking the AST.