Fix Issue 11805 - Removal of Bool has critically broken expression evaluation