Fix spacing in enum bodies and get rid of the last 'virtual'