modtool: Fixes for in-tree adds, argument parsing (&-bug)