Futher simplification.

Signed-off-by: Marinus Hooft <wobblydeveloper@gmail.com>