+ Extra extra backwards compatibility handling.