Highlighting and unmarshaling improvements