Improve consistency.