Fix treatement of EM/S tags to follow spec.