Clean-up bool-fix code.