More robust build failure detection, and some cleanup of Usage: text.