Remove static descriptor lookups
Descriptor usage cleanups! First round.