Fix a few struct size declarations Was wrong. As excercised by defining VAR to other than 1 in hb.hh.