diff --git a/src/common/construct.h b/src/common/construct.h
index 904a124f0..081c0487a 100644
--- a/src/common/construct.h
+++ b/src/common/construct.h
@@ -139,9 +139,9 @@ cons_impl(EbmlMaster *master,
 }
 
 template<typename T>
-EbmlMaster *
-master() {
-  T *master = new T;
+auto
+master() -> T * {
+  auto *master = new T;
   for (auto element : *master)
     delete element;
   master->RemoveAll();
@@ -149,15 +149,15 @@ master() {
 }
 
 template<typename Tmaster>
-inline EbmlMaster *
-cons() {
+inline auto
+cons() -> Tmaster * {
   return master<Tmaster>();
 }
 
 template<typename Tmaster,
          typename... Targs>
-inline EbmlMaster *
-cons(Targs... args) {
+inline auto
+cons(Targs... args) -> Tmaster * {
   auto master = cons<Tmaster>();
   cons_impl(master, args...);