In general we've tried to keep regexes simpler in order to balance perf with readability and maintainability.
Please just add a new regexp here instead of updating the existing one.