diff --git a/src/duneevaluate.cc b/src/duneevaluate.cc
index fd6159fffaa6995a1a4d21d3d89c7156546b008c..4af3f5ff483120f3d6f1cb63b4f1e00153c4876b 100644
--- a/src/duneevaluate.cc
+++ b/src/duneevaluate.cc
@@ -14,12 +14,11 @@
 DEFUN_DLD(duneevaluate, args, nargout, "the help string") {
   assert(args.length() == 1);
   ColumnVector point(args(0).matrix_value());
-  // FIXME: We're only working with dimension two for now
-  assert(point.length() == 2);
 
   int const dim = 2;
-  typedef Dune::SampleFunctional<dim> SampleFunctional;
 
+  // {{{ The usual setup
+  typedef Dune::SampleFunctional<dim> SampleFunctional;
   SampleFunctional::SmallMatrix A;
   A[0][0] = 3;
   A[0][1] = 1.5;
@@ -31,6 +30,7 @@ DEFUN_DLD(duneevaluate, args, nargout, "the help string") {
 
   Dune::SampleFunction f;
   SampleFunctional J(A, b, Dune::MyNonlinearity<dim>(f));
+  // }}}
 
   SampleFunctional::SmallVector our_point;
   Dune::octaveToDune<dim>(point, our_point);
diff --git a/src/duneminimise.cc b/src/duneminimise.cc
index e2ee46230e4d7cebe60c2ca59d4bdca97a74ff74..6e492fab12e090f1cd17c6ab68f28ac9f318a61d 100644
--- a/src/duneminimise.cc
+++ b/src/duneminimise.cc
@@ -14,12 +14,11 @@
 DEFUN_DLD(duneminimise, args, nargout, "the help string") {
   assert(args.length() == 1);
   ColumnVector current(args(0).matrix_value());
-  // FIXME: We're only working with dimension two for now
-  assert(current.length() == 2);
 
   int const dim = 2;
-  typedef Dune::SampleFunctional<dim> SampleFunctional;
 
+  // {{{ The usual setup
+  typedef Dune::SampleFunctional<dim> SampleFunctional;
   SampleFunctional::SmallMatrix A;
   A[0][0] = 3;
   A[0][1] = 1.5;
@@ -31,6 +30,7 @@ DEFUN_DLD(duneminimise, args, nargout, "the help string") {
 
   Dune::SampleFunction f;
   SampleFunctional J(A, b, Dune::MyNonlinearity<dim>(f));
+  // }}}
 
   SampleFunctional::SmallVector start;
   Dune::octaveToDune<dim>(current, start);
@@ -39,8 +39,8 @@ DEFUN_DLD(duneminimise, args, nargout, "the help string") {
   Dune::minimise(J, start, correction);
   start += correction;
 
-  ColumnVector foo(dim);
-  Dune::duneToOctave<dim>(start, foo);
+  ColumnVector ret(dim);
+  Dune::duneToOctave<dim>(start, ret);
 
-  return octave_value(foo);
+  return octave_value(ret);
 }