One minor style nitpick, I think we should prefer long-named options in scripts. I won't block on this, but just a consideration for other changes.