track variable binding context to be more selective about applying order by optimization
remove completed TODO comment
work on order by optimization tests
remove completed task