Cleanup: ditch temp and switch to canonical snockets.