Fix some edge cases. Next step is handling patterns.
Fix some edge cases. Next step is handling patterns.

cekdahl/expreduce,corywalker/expreduce,corywalker/cas,corywalker/cas,cekdahl/expreduce,corywalker/cas,corywalker/expreduce,cekdahl/expreduce,corywalker/expreduce