Renaming --optional to --statement.optional. We are leaving in the old functionality, but it is now
deprecated and will be removed soon.