Fundemental refactor for planned additional clone operations. No behaviour change intended in this commit.