Add missing initialisers and fix order. In some cases the member was actually unused and could just be removed. Change-Id: I0f0c927eb8271c35dcfd371f225847f62bea2812 Warned-by: Coverity