Reverting changes.
It was a good idea, but WTH.  It seemed to work only when certain checks were in place, but not when they were gone.  We'll just have to deal with sub-commands the same way we deal with admin commands.
Accidentally reverted this file.