Update how deprecations are handled, remove deprecations from shorthand methods.