Changed most assumes to not use lambdas.