diff --git a/src/one-body-sample.cc b/src/one-body-sample.cc
index ed35729394f3ec0edec5a76140e7fe69051d8247..63896959b564b8013f674316e0721df58a9f7f20 100644
--- a/src/one-body-sample.cc
+++ b/src/one-body-sample.cc
@@ -143,25 +143,22 @@ void assemble_nonlinearity(
     Dune::shared_ptr<Dune::GlobalNonlinearity<dim> const> &myGlobalNonlinearity,
     Dune::shared_ptr<Dune::BlockVector<Dune::FieldVector<double, 1>>>
         nodalIntegrals) {
+  typedef Dune::BlockVector<Dune::FieldVector<double, 1>> SingletonVectorType;
+
   // {{{ Assemble terms for the nonlinearity
-  auto mu =
-      Dune::make_shared<Dune::BlockVector<Dune::FieldVector<double, 1>>>(size);
+  auto mu = Dune::make_shared<SingletonVectorType>(size);
   *mu = parset.get<double>("boundary.friction.mu");
 
-  auto normalStress =
-      Dune::make_shared<Dune::BlockVector<Dune::FieldVector<double, 1>>>(size);
+  auto normalStress = Dune::make_shared<SingletonVectorType>(size);
   *normalStress = parset.get<double>("boundary.friction.normalstress");
 
   std::string const friction_model =
       parset.get<std::string>("boundary.friction.model");
   if (friction_model == std::string("Ruina")) {
-    auto a = Dune::make_shared<Dune::BlockVector<Dune::FieldVector<double, 1>>>(
-        size);
+    auto a = Dune::make_shared<SingletonVectorType>(size);
     *a = parset.get<double>("boundary.friction.ruina.a");
 
-    auto eta =
-        Dune::make_shared<Dune::BlockVector<Dune::FieldVector<double, 1>>>(
-            size);
+    auto eta = Dune::make_shared<SingletonVectorType>(size);
     *eta = parset.get<double>("boundary.friction.eta");
 
     myGlobalNonlinearity =