Partial hunkwise-claiming algorithm
Blame: merge-less case working, clean up