Merge "Simplify the consume before traversal heuristic." into jb-dev