This helps re-factor away some of the repetitive code and makes the code
flow more nicely.
Signed-off-by: NAlex Bennée <alex.bennee@linaro.org>
Signed-off-by: NChristoffer Dall <christoffer.dall@linaro.org>