WIP - very small refactor to use parse-parens