Simplified flow in a few classes (inverting if's for early return.
WebPlugin now provides feature options for which pieces of functionality it replaces.