I believe `application/xhtml+xml` should keep being serialized with the [XHTML method](http://www.w3.org/TR/xslt-xquery-serialization/#xhtml-output) by default. 
Are you OK with handling the case were the `xml` method is forced rather than making the default ?