Better separation of compatibility handling.