BZ-1172711 - Regression in handling of inner classes/enums