Fixes #19; removed a lot of cruft for heuristics in general