Some cleanup + support top-level typed args.