Removed deprecation chains; fixed argument passing to deprecated()