Improved currency regexes