Revert some freezes on non-literals