Fixed on trunk via check-in [42798551ca].  Instead of creating a new enumeration,
the existing one was updated to include the extended return codes.