#3846: Move some markup around and add labels to things.