diff --git a/src/abg-hash.cc b/src/abg-hash.cc
index 1d168a21..8bec5ae2 100644
--- a/src/abg-hash.cc
+++ b/src/abg-hash.cc
@@ -742,8 +742,7 @@ operator()(const shared_ptr<class_tdecl> t) const
 ///
 /// @return the resulting hash
 size_t
-type_base::dynamic_hash::
-operator()(const type_base* t) const
+type_base::dynamic_hash::operator()(const type_base* t) const
 {
   if (t == 0)
     return 0;
diff --git a/src/abg-reader.cc b/src/abg-reader.cc
index 98dcdc85..7228218e 100644
--- a/src/abg-reader.cc
+++ b/src/abg-reader.cc
@@ -175,7 +175,7 @@ public:
       return 0;
   }
 
-  shared_ptr<decl_base>
+  decl_base_sptr
   get_cur_decl() const
   {
     if (m_decls_stack.empty())
@@ -198,16 +198,16 @@ public:
   }
 
   void
-  push_decl(shared_ptr<decl_base> d)
+  push_decl(decl_base_sptr d)
   {
     m_decls_stack.push(d);
   }
 
-  shared_ptr<decl_base>
+  decl_base_sptr
   pop_decl()
   {
     if (m_decls_stack.empty())
-      return shared_ptr<decl_base>(static_cast<decl_base*>(0));
+      return decl_base_sptr();
 
     shared_ptr<decl_base> t = get_cur_decl();
     m_decls_stack.pop();
diff --git a/src/abg-writer.cc b/src/abg-writer.cc
index 1a23c143..e45902ae 100644
--- a/src/abg-writer.cc
+++ b/src/abg-writer.cc
@@ -765,7 +765,8 @@ write_translation_unit(const translation_unit&	tu,
 ///
 /// @return true upon successful completion, false otherwise.
 static bool
-write_type_decl(const shared_ptr<type_decl> d, write_context& ctxt,
+write_type_decl(const type_decl_sptr d,
+		write_context& ctxt,
 		unsigned indent)
 {
   if (!d)