Gardening and comments

Nothing particularly interesting in this PR, just a bit of cleanup and comments ; maybe it's worth it.

(I spent some time in the source trying to understand per-step syntax highlighting - wanting to highlight my own app code in step-failure.)