Added slight optimization to Boolean handling.