Cleaning up the code before making the real changes in MSWriter.
Most of the work is done by clang-tidy.
Closes RAP-258