Add Will's changes to allow deprecated decorator to work with properties.