sh: trivial build cleanups.