tempted to lift those into singletons on the rust side