WIP: simplify makevars