:necktie: tidy up all the sticky headers now that they're in place.