Give more helpful error message when unable to find a variable
Don't try to be too clever when deciding which variables to keep

They are lazily evaluated now anyway...