Implemented expandScope (messily) and re-enabled strict core in Witness