clone() improvements.