Fix if block line number parsing.  Fix waitforre line matching.