Minor regexp improvements