cleanup eval-when
reduced top-level stat kinds, because of conflicts