Some minor cleaning up.
Some minor cleaning up of Core::UserMessageWidget.