Simple Injector added.
Moved Unity list special case in a more specific location.
Improved generation of comments so they can be read without hovering.