Enhanced overwrought old-new enumeration

27