remove trailing spaces and semicolons
Uref.uref -> Uref.new
introduce Uref for both polyml and mosml