removed etaExpand (insufficiently general)