Add better support for using deprecated symbols internally