Tidy-up and properly encapsulate Utf8Matcher