WIP: fix up IVar to work with prev changes