Merge "Use std::enable_if instead of a custom helper class."