tImproved type-checking for getter conditions.