Revamp arguments/options/flags handling