More fixes for anonymous enums/records