Synced with subtle style changes in hib-paper.tex