diff --git a/gtsam/nonlinear/ISAM2-impl.cpp b/gtsam/nonlinear/ISAM2-impl.cpp
index f62f2aafb..92f6425dc 100644
--- a/gtsam/nonlinear/ISAM2-impl.cpp
+++ b/gtsam/nonlinear/ISAM2-impl.cpp
@@ -201,7 +201,7 @@ void ISAM2::Impl::ExpmapMasked(Values& values, const VectorValues& delta,
     assert(key_value->key == key_delta->first);
     Key var = key_value->key;
     assert(delta[var].size() == (int)key_value->value.dim());
-    assert(delta[var].unaryExpr(ptr_fun(isfinite<double>)).all());
+    assert(delta[var].allFinite());
     if(mask.exists(var)) {
       Value* retracted = key_value->value.retract_(delta[var]);
       key_value->value = *retracted;
diff --git a/gtsam/nonlinear/ISAM2.cpp b/gtsam/nonlinear/ISAM2.cpp
index 2ec964b93..380b6c87f 100644
--- a/gtsam/nonlinear/ISAM2.cpp
+++ b/gtsam/nonlinear/ISAM2.cpp
@@ -258,9 +258,6 @@ ISAM2::relinearizeAffectedFactors(const FastList<Key>& affectedKeys, const FastS
 // find intermediate (linearized) factors from cache that are passed into the affected area
 
 GaussianFactorGraph ISAM2::getCachedBoundaryFactors(Cliques& orphans) {
-
-  static const bool debug = false;
-
   GaussianFactorGraph cachedBoundary;
 
   BOOST_FOREACH(sharedClique orphan, orphans) {
diff --git a/tests/testGaussianISAM2.cpp b/tests/testGaussianISAM2.cpp
index feaad5c92..0e68589e7 100644
--- a/tests/testGaussianISAM2.cpp
+++ b/tests/testGaussianISAM2.cpp
@@ -649,7 +649,7 @@ namespace {
     //Matrix actual2AugmentedHessian = linearFactors_.augmentedHessian();
     Matrix actual3AugmentedHessian = isam.getFactorsUnsafe().linearize(
       isam.getLinearizationPoint())->augmentedHessian();
-    assert(actualAugmentedHessian.unaryExpr(std::ptr_fun(&std::isfinite<double>)).all());
+    assert(actualAugmentedHessian.allFinite());
 
     // Check full marginalization
     //cout << "treeEqual" << endl;