Follow up r64819. Cosmetical fixes.