Refactor BlocklistHeurCalculator and DecisionTreeHeurCalculator.

Use common code base for these classes. Fixes #2.