diff --git a/include/fmt/core.h b/include/fmt/core.h
index 2f309501..2881c200 100644
--- a/include/fmt/core.h
+++ b/include/fmt/core.h
@@ -870,7 +870,8 @@ namespace internal {
 template <typename Context, typename T>
 class get_type {
  public:
-  typedef decltype(make_value<Context>(std::declval<typename std::decay<T>::type&>())) value_type;
+  typedef decltype(make_value<Context>(
+        std::declval<typename std::decay<T>::type&>())) value_type;
   static const type value = value_type::type_tag;
 };
 
diff --git a/include/fmt/format.h b/include/fmt/format.h
index f77b51c6..15717fbd 100644
--- a/include/fmt/format.h
+++ b/include/fmt/format.h
@@ -642,13 +642,7 @@ class null_terminating_iterator {
     return ptr_ >= other.ptr_;
   }
 
-  // 'fmt::internal::pointer_from': the inline specifier cannot be used
-  // when a friend declaration refers to a specialization of a function
-
-  // pointer_from is defined with the inline specifier, but declared without,
-  // so this looks like a bug in the compiler.
   friend FMT_CONSTEXPR_DECL const Char *pointer_from<Char>(
-# pragma warning(suppress: 4396)
       null_terminating_iterator it);
 
  private: