diff --git a/src/util/StringBuffer.hxx b/src/util/StringBuffer.hxx
index d58990090..1ef562684 100644
--- a/src/util/StringBuffer.hxx
+++ b/src/util/StringBuffer.hxx
@@ -42,15 +42,17 @@ public:
 	typedef T &reference;
 	typedef T *pointer;
 	typedef const T *const_pointer;
-	typedef const_pointer const_iterator;
 	typedef size_t size_type;
 
 	static constexpr value_type SENTINEL = '\0';
 
 protected:
-	std::array<value_type, CAPACITY> the_data;
+	typedef std::array<value_type, CAPACITY> Array;
+	Array the_data;
 
 public:
+	typedef typename Array::const_iterator const_iterator;
+
 	constexpr size_type capacity() const {
 		return CAPACITY;
 	}
@@ -72,7 +74,7 @@ public:
 	}
 
 	constexpr value_type front() const {
-		return c_str()[0];
+		return the_data.front();
 	}
 
 	/**
@@ -90,11 +92,11 @@ public:
 	}
 
 	constexpr const_iterator begin() const {
-		return the_data;
+		return the_data.begin();
 	}
 
 	constexpr const_iterator end() const {
-		return the_data + capacity();
+		return the_data.end();
 	}
 
 	constexpr operator const_pointer() const {