- further fixups to deal with nested submodules correctly