Let's remove these...

Change-Id: Ie4f15c894c13fd52e1ee175381a1e62b33864d39
Reduce indentation by early bailout.

Change-Id: I64c88b007564d3ca7b4f4bd95a458fee6bda7854