fix submodule `expand' handling

Trying again for 4a0adb6a74.