Finish #678 support (e.g. in the Make driver).