Ensure eval callbacks gets a fresh vars dict
Simplify manifest API and put tests back on green