ErrorStatus code cleanup.