Made a missing correction for deep which makes the code conforming to
the previous claim concerning extending the supported cloning scenarios.

Did a bit of general cleaning up.

Signed-off-by: Jakob Brandsborg Ehmsen <jakobehmsen.github@gmail.com>