IF we have multiple references to "List", or "List X" in a piece of code, consolidate to a single one (preferably the one in the core env)