some simplifications thanks to such-as bug fix

see http://dafny.codeplex.com/workitem/10