Optimizations and usability improvements to conversion routines