exit is still handled poorly. R=rsc APPROVED=rsc DELTA=6 (6 added, 0 deleted, 0 changed) OCL=34288 CL=34315