Clean up the "agent setup" command a bit

refs #7423