Reenabled a bunch of var resolutions.