Rework markup to be simpler.