Improved case insensitivity of matchers