Get rid of circular dependency on MessageBundle

Create a new, one shot, singleton InternalBundle which has the three methods,
and all messages, necessary to replace what was before a pain to handle.