Reformat previous patch

And fix a MSVC warning while there:

 warning C4804: '>>' : unsafe use of type 'bool' in operation

No functional change.