WIP Clean up regex quoting