Fix distinction between local and expression types in consinfra
Fix distinction between local and expression types in consinfra

ucsd-progsys/csolve-bak,ucsd-progsys/csolve,ucsd-progsys/csolve-bak,ucsd-progsys/csolve-bak,ucsd-progsys/csolve,ucsd-progsys/csolve,ucsd-progsys/csolve-bak,ucsd-progsys/csolve,ucsd-progsys/csolve-bak,ucsd-progsys/csolve-bak,ucsd-progsys/csolve,ucsd-progsys/csolve-bak,ucsd-progsys/csolve-bak,ucsd-progsys/csolve,ucsd-progsys/csolve-bak,ucsd-progsys/csolve-bak,ucsd-progsys/csolve,ucsd-progsys/csolve,ucsd-progsys/csolve,ucsd-progsys/csolve,ucsd-progsys/csolve,ucsd-progsys/csolve-bak