Remove hackish eval unpacking