[cvs-nhc98] patch applied (york-compiler98): Remove ordinary guards, keeping just pattern guards.