Minor cleanup in calc_neighbors_local