Strengthen the signal for API removal in the 5.0 release. See also #1594 that actually removes long-deprecated API.
