Fix styling problems and trace stack logic.
Styling and usability of substitutions.