unified some untyped wrappers