Simplify command line encoding