-getUniqueDs us loc mod_and_grp env warns
- = case (getUnique us) of { assigned_uniq ->
- (assigned_uniq, warns) }
+getUniqueDs dflags us genv loc mod warns
+ = (uniqFromSupply us, warns)
+
+getUniquesDs :: DsM [Unique]
+getUniquesDs dflags us genv loc mod warns
+ = (uniqsFromSupply us, warns)
+
+getDOptsDs :: DsM DynFlags
+getDOptsDs dflags us genv loc mod warns
+ = (dflags, warns)