Making the build file format a bit more flexible, but consistent.