Improve regex support retaining backwards compat.