Further refactoring, including stripping obsolete CoRRE encoding which was documented as 'broken' anyway