Simplifying makevars