Some more pedantic changes.