Attempt to straighten out type_traits "development" commits