This makes the code quit a bit more readable, I believe. Change-Id: I4aef30d5e20d095c421a13ad5104d64c71361c88