Fix a bad reference when type-hinting.
Support variables in a disjunction!