Some minor cleanup before creating a topic branch so I can improve the Install plugin (implementing the new FormHelper validation functionality).