Fixed bug that meant not all insert points considered, plus modified
greedy ordering to consider later blocks that can be added well in
multiple places.