Var & init improvements

This PR replaces https://github.com/e-ucm/ead/pull/577, which I'll be closing right now