Revert "intp->uintp and flake8 cleanups"

This reverts commit 70c3584e71b6557c637298fd959ec88d2fe76b74.
Fewer intp->uintp changes