A few build file cleanups.