Make the Presentation Language pieces be conformant with the
language defined earlier in the RFC. Clean up some ambiguities
in that language definition.