changed EXPAND_AS_DEFINED to be a list, not str