Per code review feedback, just nuke the deprecations, and outright require a binding annotation.