Fix some leftovers from the last v4 removal patch

A few things overlooked. Also adjust the numbering in one enum
to fix a crash.

Change-Id: Iedf641452f6f14ffc36d548d970079f0d6024bb6
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>