Fix recent problems with admin command parsing.
Sort out adminhelp command listing issues.