Fix missing hitgroup ids.
Apply suggestions from comments.
Merge remote-tracking branch 'origin/master'