(instead of using 'int'.) This triggered quite a few compiler warnings which are also dealt-with by this patch.