A bit more markup cleanup