Eliminate warning about deleting instance where object's base class has non-virtual descructor
Eliminate warnings pertaining to unused 'dummy' vars
Prevent timeout exit when --no-timeout is used
Remove tab chars to correct indentation