Replacing some integral typedefs with standard types