Unbreak --debugger and simplify debug arg handling