Make stuff more consistent.