Update some package users to the new API. Add some missing requires.