Compatibility refactor.