Make logic for old-sprit-demanding compilers work.
The previous code was all broken, trying to mix conditional requirements and indirect conditional requirements like:
<toolset>borland:<conditional>@include-spirit