prevent double evaluation with merged sections
remove unused Evaluator$invalidate method
tidy up splice logic