Properly parse the commands coming from -X