Once more: Clone opts before modifying the damn thing!

* Second time I am making this mistake on this codebase.
* Move Util.clone into utils.