Add back boolean helper; change constant name