Moved MessageBuilder into its own package, and factored out some utility methods from it into a MacroUtilities class. Documented these methods.