Fix clang issues in FastSimulation.
Merge pull request #3807 from ktf/clang-fastsim

Clang -- Fix clang issues in FastSimulation.