Cleanup for std::result

I am doing some cleanups in std::result.