Various minor tweaks to prose and content models; no significant effect on schema