Fix #marshal_dump and #marshal_load part deux

The first one looks good to me. @brixen any other suggestions?