Avoid copying of singular iterators

Change-Id: If873d2c369ef6458fdf3289f09802e90dc7367f2
Minor utl::TempFile clean up

Change-Id: I20de8b2321d2656d17d25c6343d72c534d47e597