More work on the Build task.