Fix bug #317576 (deprecate Remapping...Adapter classes, replace them with ...Remapper classes that do not depend on LocalVariablesSorter).