Fix marshalling structures
Avoid stealing ownership of signatures
Hunk by-line accessors