Applied patches from Boost.TypeIndex