Next patch will add minimum checking, so use a more generic name.
Refactor return values to the commonly used semantics.