Mnemonics, focus and dead code fixes

Merged Vanadiae requested to merge Vanadiae/gnome-builder:some-small-fixes-2021-07-16 into master

See commit messages for details.

Merge request reports