Save the position of while and until keywords in source
Remember position of evstr
Remember position of dstr
Bug fix: Yield sexp was lacking source.