Expand deprecation helper and use for its deprecation