Does it make sense to pull the command off the `Extra' list here? Then the called command won't need to match off the first element in the list.