Various improvements to PresentationBuilder code

 in support of building a presentation (#4095)