Do less in swap! when loading msgs.
More changes.