Make Rules.mk more compatible with merges and local diffs.