lspclient: code cleanups

Mark Nauwelaertsrequested to merge
work/lsp_code_maint into master

No functional changes; some code cleanup/maintenance.

Merge request reports