Minor: replace OSingleItemSet with Collections.singleton()