std::{uint, int} cleanups