cleaning up after migration to scalaz.Tree