Simplify, and future-proof, a dependency in the build system