More build cleanups.