Rebasing marshal.c