Fixed compile error introduced by recent merge

Git merged a commit where MAX_RUN_TIME had been removed with one that
introduced additional uses of the variable.  Both parent commits were
good, but the resulting merge produced compile errors.  These are now
fixed.