Fix D6 issues

It isn't so much that other libraries are using it, I'd just prefer not to change the already working 8.x and 7.x to become backward compatible with 6.x if we don't have to. Cloning a 6.x user object should not really be much of a performance issue.