More mahotas cleanup, plus add cytoolz