I don't have any proposed versions of these; they're just things that need work from someone, and I expect I'll be the one doing it. Feel free to be bold and/or add comments to my talk page.