Metadata: syntax, doc & parsing improvements.