bug-1198: Non-functional clean-ups (wording, markup)