changed envs to use more dependent types and now everything is wonderful (in core and source; still need to do target)