Comply with std::norm and fixes to numeric
Header safety in dispatchers