include Enumerable functional and fix rewrite conversion rules