Fix several bugs related to finding free variables