Another nimrodel update

We don't have to do this quite so systematically,
but at this stage it's mostly practice with
`git submodule`