Small status code related cleanups.