Add: discrimination between MBS and WCS in hash map keys;
Add: a minor simplification to regex caching;
Add: a few more tests and minor improvements.