Another int/bool cleanup