Change collections from EMPTY_LIST to emptyList()