enhanced Repeat annotation now supports class level declarations.
Merge pull request #2175 from ahmetmircik/fix/3.x

Map eviction code cleanup & refactorings (maintenance 3.x)