Be smarter about modifying the ns when moving defns

Obviously easier to update the existing :require clause than to rebuild
it.  Don't code when tired, kids.