fix #2775, restore long versions of command line opts