Simplify inclusion of mappings for remaining control characters.
Add some unit testing for rule set combination.