Porting my update to the maybeHelp() function in Maintenance.php into the trunk....