Reduce cache key instability caused by feature discovery during has!
loader plugin branching.  Also simplify/consolidate calculation of
expanded dependencies.