Allow setting include/exclude inside with statement giving access to
object properties and effectively skipping entire with block for
excluded objects
 - Note: Excluded repetable objects may no longer be referenced (which
 was pretty weird in the first place)
Fix builder object names not always unique when builders were excluded