formatting and general pedantry
Merge remote-tracking branch 'origin/fromliteral' into fromliteral

Conflicts:
	active/0000-fromliteral.md