Improve markup and remove contractions.

MFC after:	1 week