Applied previous fix to where, select, forall, and associate constructs.