Proposed fixes for Issue 13547.

try to avoid whitespace changes (this is just nit)