Cleaned up some type mess.