Minor code lisibility improvements on HTG and HTG geom filter.

Change-Id: I96a5f7fcdbf041e6322699437efd3517d43b01d8
Merge topic 'MinorsCorrectionsOnHTG' into master

c2b36387 Minor code lisibility improvements on HTG and HTG geom filter.