Refactor
More work on not computing constant conditions in WHERE/ON
More work on WHERE