Adjust order of NameID encoders for transient IDs so the right 2.0 format gets used...