Major cleanup of MessageList. Fixes #401
Build cleanup