Misc conversion.h cleanups
Remove unused variable warning