Improve ease-of-use as a library.
Made references to mutable.Map explicit.