Removed internal content-type vars and move to function parameters.