Improve submodule handling.