Clean up some types now that I know what I'm doing.