swift234

Reflection: Fixes for deriveSubstitutions() patch

Somehow ninja didn't rebuild everything, so I ended up pushing code
that didn't compile. I did a clean re-build and fixed a minor issue
in the logic, now the test passes.