TUCKER: Use boolean instead of integer in several places