Tighten up join ordering rules to account for recent more-careful analysis