Cure for Constant Comparison?