Update some expHTML2PDF logic/phrasing