Non-negative integer refactoring and draft work on integer.