Rename the ScrubTyVars? moduel to ScrubTypeVars?. This makes it more consistent with the data types and function names now used.