fix envFindAnnot to lookup regular environment too...
ugh, still 30 failing tests
oh no. consWhile is STILL broken. sigh.