Revert "xbanish-git: fix a bunch of namcap warnings"

This reverts commit 7efbffa936b7151891f55ccfa170a95e27d0d576.
Revert "Revert "xbanish-git: fix a bunch of namcap warnings""

This reverts commit 4d573981429af7185205470869782fcfcf155716.
Revert "Revert "Revert "xbanish-git: fix a bunch of namcap warnings"""

This reverts commit 78e18f4f69ff2ebe4af588061370be67e5970dd7.
thats better