Index: src/AST/Attribute.hpp
===================================================================
--- src/AST/Attribute.hpp	(revision 5f225f59101d268668c9c4862e607c9573860bfb)
+++ src/AST/Attribute.hpp	(revision 2c8946b85385514ba04b2c0df6e5c5bb5f4781df)
@@ -53,5 +53,5 @@
 	friend node_t * mutate(const node_t * node);
 	template<typename node_t>
-    friend node_t * shallowCopy(const node_t * node);
+	friend node_t * shallowCopy(const node_t * node);
 };
 
Index: src/AST/Bitfield.hpp
===================================================================
--- src/AST/Bitfield.hpp	(revision 5f225f59101d268668c9c4862e607c9573860bfb)
+++ src/AST/Bitfield.hpp	(revision 2c8946b85385514ba04b2c0df6e5c5bb5f4781df)
@@ -60,10 +60,10 @@
 
 template<typename T>
-inline bool operator== ( const bitfield<T> & a, const bitfield<T> & b ) {
+inline bool operator==( const bitfield<T> & a, const bitfield<T> & b ) {
 	return a.val == b.val;
 }
 
 template<typename T>
-inline bool operator!= ( const bitfield<T> & a, const bitfield<T> & b ) {
+inline bool operator!=( const bitfield<T> & a, const bitfield<T> & b ) {
 	return !(a == b);
 }
Index: src/AST/FunctionSpec.hpp
===================================================================
--- src/AST/FunctionSpec.hpp	(revision 5f225f59101d268668c9c4862e607c9573860bfb)
+++ src/AST/FunctionSpec.hpp	(revision 2c8946b85385514ba04b2c0df6e5c5bb5f4781df)
@@ -22,30 +22,29 @@
 namespace Function {
 
-	/// Bitflags for function specifiers
-	enum {
-		Inline   = 1 << 0,
-		Noreturn = 1 << 1,
-		Fortran  = 1 << 2,
-		NumSpecs      = 3
+/// Bitflags for function specifiers
+enum {
+	Inline   = 1 << 0,
+	Noreturn = 1 << 1,
+	Fortran  = 1 << 2,
+};
+
+/// Bitflag type for storage classes
+struct spec_flags {
+	union {
+		unsigned int val;
+		struct {
+			bool is_inline   : 1;
+			bool is_noreturn : 1;
+			bool is_fortran  : 1;
+		};
 	};
 
-	/// Bitflag type for storage classes
-	struct spec_flags {
-		union {
-			unsigned int val;
-			struct {
-				bool is_inline   : 1;
-				bool is_noreturn : 1;
-				bool is_fortran  : 1;
-			};
+	constexpr spec_flags( unsigned int val = 0 ) : val(val) {}
+};
 
-			// MakeBitfieldPrint( NumSpecs )
-		};
+using Specs = bitfield<spec_flags>;
 
-		constexpr spec_flags( unsigned int val = 0 ) : val(val) {}
-	};
+}
 
-	using Specs = bitfield<spec_flags>;
-}
 }
 
Index: src/AST/StorageClasses.hpp
===================================================================
--- src/AST/StorageClasses.hpp	(revision 5f225f59101d268668c9c4862e607c9573860bfb)
+++ src/AST/StorageClasses.hpp	(revision 2c8946b85385514ba04b2c0df6e5c5bb5f4781df)
@@ -22,38 +22,37 @@
 namespace Storage {
 
-	/// Bitflags for storage classes
-	enum {
-		Extern         = 1 << 0,
-		Static         = 1 << 1,
-		Auto           = 1 << 2,
-		Register       = 1 << 3,
-		ThreadLocalGcc = 1 << 4,
-		ThreadLocalC11 = 1 << 5,
-		NumClasses          = 6
+/// Bitflags for storage classes
+enum {
+	Extern         = 1 << 0,
+	Static         = 1 << 1,
+	Auto           = 1 << 2,
+	Register       = 1 << 3,
+	ThreadLocalGcc = 1 << 4,
+	ThreadLocalC11 = 1 << 5,
+};
+
+/// Bitflag type for storage classes
+struct class_flags {
+	union {
+		unsigned int val;
+		struct {
+			bool is_extern         : 1;
+			bool is_static         : 1;
+			bool is_auto           : 1;
+			bool is_register       : 1;
+			bool is_threadlocalGcc : 1;
+			bool is_threadlocalC11 : 1;
+		};
 	};
 
-	/// Bitflag type for storage classes
-	struct class_flags {
-		union {
-			unsigned int val;
-			struct {
-				bool is_extern         : 1;
-				bool is_static         : 1;
-				bool is_auto           : 1;
-				bool is_register       : 1;
-				bool is_threadlocalGcc : 1;
-				bool is_threadlocalC11 : 1;
-			};
+	constexpr class_flags( unsigned int val = 0 ) : val(val) {}
 
-			// MakeBitfieldPrint( NumClasses )
-		};
+	bool is_threadlocal_any() { return this->is_threadlocalC11 || this->is_threadlocalGcc; }
+};
 
-		constexpr class_flags( unsigned int val = 0 ) : val(val) {}
+using Classes = bitfield<class_flags>;
 
-		bool is_threadlocal_any() { return this->is_threadlocalC11 || this->is_threadlocalGcc; }
-	};
+}
 
-	using Classes = bitfield<class_flags>;
-}
 }