Simplify incremental builds