P3: While perhaps not within scope of this change I see two problems with this:

* The comment (14) does not seem to match the implementation
* Serverside concatenation seems very shortsighted. Why is this not handled via CSS?