Missed some annotation edits.
De-version Numeric
De-version Enumerable