Replace Collections.EMPTY_LIST with Collections.emptyList()