Deprecate some constants that should have been deprecated in 4.2