Clean up SpecialMassMessage

Minor refactor of some logic and clean up some comments. Should not
change actual behaviour.

Change-Id: I7a92825edf24de0ad3c01f5b91b16982e79faa62
Merge "Clean up SpecialMassMessage"