WIP Handle all eta-expansion on demand