cleanup some more if statements

Change-Id: I9f3ba79f069c79faefdd9eacdc8f40cd0411f11d
Reviewed-by: Karsten Heimrich <karsten.heimrich@digia.com>