Update rules to take out antiquated makevars