Fix unexpanded variables in IndexedSeq referenced from scala package object.

I think this CL needs to be squashed with some previous one.