Use EncodingMap for performance
Fix typo
Unify closely-related specs and rephrase description