Minor fixes for consistency and ease of editing.