Don't require commandLine.inc when not using the command line; instead, move wfWaitFo...