MSVC pair can't convert 0 to a nullptr.
Merge topic 'minor-cleanups' into next

fb44959 MSVC pair can't convert 0 to a nullptr.