Command parsing has been simplified.