Avoid use of deprecated symbols.