Minor cleanup in unfold