Fixing macro regex to require closing parens