OFStateManager: add more gentable TODOs