Small cleanup PT1.