Remove CORELOCK_SWAP (unused since r16981)