Avoid needlessly splitting a UniqSupply

We don't have to split a UniqSupply if all we want is a Unique. Just use
takeUniqFromSupply or similar, instead.