r19139: typos; consitent ordering of operations