Unified parser names (Subrule instead of SubRule because of Charset
instead of CharSet).
Removed unused code.