Rework frontmatter marshal/unmarshal