Drop some more of the shellcheck-inspired changes