Further code review from the end of #2730

This is a technical PR that addresses code review points that arose in #2730.
No expected changed in physics output, timing for rechits should be improved.

@bachtis -- this covers most of the stuff you and Slava were discussing last night too