Add some type wrappers.