Removed differentiation of presentation, format, and encoding

In preparation for naming them in config.