Merged! It's time we grow up. If this causes rendering errors due to compatibility modes the prior XHTML header was triggering, we can fix those up in subsequent commits.