Some more code consistency changes.