[535888] Rationalize static/nonstatic feature lookups
3 files changed