Same guy. Amalgamated a little, but Diggler was mostly Holmes.
Teacake, is it possible that Janeway put a scurry of time delayed, time released punishments, penalizations and reprimands in their permanent records for harry and Tom that were not to take effect until Voyager returned to the Alpha Quadrant?
Which is no worse than the handcuffs and cells waiting for the Maquis on the other side of the AQ border.