This commits add some helpers to assert that we have a certain number of values and for common cases of retrieving one or two values.
This change is