Yes, this appear to do it (see attached).
There's still one line left (M82), but it's fine for my purpose, I guess.
As Chjohans mentioned:
I totally agree, though I think there might be reason to the madness.
Perhaps a small (i) could be added to the Start G-code box?