fix stuff clobbered in rebase + don't reexport serialize::serialize