A bit more desingletonifying