(fixup) Use std::is_same instead of own implementation