It was a huge confusing mess of parameter passing around
and around.  Add a few extra assertions to ensure we're
handling parent/child relationships properly.