MFC r348311:
Fix indentation and while at it simplfy the code.
Reported by: lwhsu@ Approved by: re (gjb@)