Improve typography. See #1327.