Major update simplifying things when reading a build file.
Minor format changes.