Fix table implementation, preparing for vm.