Avoid dictionary comprehension on 2.6