Upgrade marionette to 2.1.0.
Finish self comments.