* [EXT] Use nonNegativeInteger i.o. the more generic integer in some places.