Changed uses of let/in to where