Perform elimination of identical terms in conjunctions and disjunctions;
Count optimized query size (cost) more correctly;
Remove optimizer enable/disable setting.