Fixed, but that doesn't solve the patchwork issue that's spread over more than 2 messages here. I've marked the MediaWiki revision that introduced it as FIXME.
