Merge branch 'sb/misc-cleanups'

* sb/misc-cleanups:
  submodule-config: don't shadow `cache`
  config.c: drop local variable

diff --cc config.c
Simple merge

diff --cc submodule-config.c
Simple merge