Rework to get going w/ Paperpile Ext code.