Massive simplification of command conversion

This also facilitates handling of \emphsubind and fixes issue #2.
Remove unused variable declarations