More changes needed around regex support.