I think the build system is fine the way it is, if it isn't broke, don't fix it.