Merge "Add explicit Result::ok() where missing"