Improved skip logic for CD4 counts - fixes CC-3