Make the markup a little bit more sensible.