Small optimizations in conversion