Some cleanup for the arguments: long versions only for the boolean flags