Data output now uses centralized and better organized data output
routines.  Removed those references to the deprecated functions, they no
longer appear to be called from anywhere except other deprecated
functions.