hbox-flex is no longer necessary

hbox is now the same as hbox-flex, so remove all hbox-flex
instances.