Eligible ref types and followups

should have an ` if (condition_improved.hasOwnProperty(c))` check