These were originally separated because of some cyclic dependency that
is gone now. So in order to make the module zoo a bit more clear,
merge the two.