Symplify & fix symbol and parameter value regexes