Clean up; lift -> witness

Aaand we’re back to crashing swiftc