remove overzealous scope optimization for where conditions