Indeed. And I hope I managed to keep them all as `[Obsolete]` methods.