Non-normative changes, first patch (Kenneth + Anssi).