Refactoring of Bool primops