Merge "Tidy up SubmoduleOp constructor"