remove unused variables
moved where adjust_mutation_counts is called
fixed declaration missing in absence of NDEBUG
cleanup