Backported h.h comment  refinements