Follow up of r200095. Code clean up.