Move where removal to new ScopeExtension class.
Fix bug with multiple wheres.
Add WhereScopes.