Simplifying the build matrix