Make some repeated string constants constant
Remove extra newlines from raw output
Remove unused error return from marshalRaw