MFC r320619 MFS r320863: Resolve confusion between different error code spaces.
Approved by: re (delphij)