Added explicit checks for likelihoods of zeros. This should eliminate any benefit from driving likelihoods to zero so that they're skipped.