More makevars tweaks. I think it might actually work this time...