Make the h1 markup a bit more flexible.

This makes integration of third-party templates (e.g. from
userprofile) easier.