This is a pretty cool feature. I don't see any tests, though. I would be happy even with mock tests just to make sure that the no_distribute flag is passed around correctly.