Move more markup to LaTeX.