Tweak findVar arg order, and eta-reduce