Re-organize option converters and fix up sname/fname handling