[Review] Address applicable comments from PR#157

Some comments in PR#157 apply here, too, so let's anticipate them.

Signed-off-by: Jerome Forissier <jerome.forissier@linaro.org>