Update contrib-annotations syntax
Better deprecation message
Don't check push-thread-bindings var expression.