BUG-4638: use universal checks for base integers