Improved output type == input type stuff so it actually works.