spaces. Upstream keeps tweaking the boolean handling, but this still blows up with most C++ code, so we revert it again to the status quo from version 8.
