gustafn
committed
on 22 Mar 08
normalize some more expressions