Remove more underscores

Remove the majority of the remaining underscored variables, including converting _this to that. Uncovered one or two needed text fixes, added as distinct commits.

edit: closes #3364 (closed)