re-enabled support for -x switch
cosmetics