Previously risk is calculated upon *entering* a correlation stage. This moves it to the end of stage for better alignment with OSSIM behavior.

Also in this commit: clean up of old coments, and minor refactor on processMatchedEvent()