Minor consistency changes.