Clean up epsilon-based comparisons
More clean up of epsilon-based comparisons