properly capture in regexes, and allow the use of $1-vars