stuff that was introduced to fix the conc-name inheritance bugs. We keep the #-bootstrap-conc-name stuff.