bs061414: Yet more damn submodule wrangling