Thank you for the update. I have made the changes as per your suggestion. Sending a v5 version of the same.

>There are still many formatting problems in the file (bad alignment,
>missing space, etc), so if we're doing this change we might as well do
>it right. I would suggest running clang-format on the whole file.
>There will be a lot of unwanted changes, but also a lot of good ones.
>Using an interactive diff tool (like meld), you can easily pick the
>changes you want and revert those you don't want.