This is mainly due to feedback by Matthieu Cattin and Wesley Terpstra
Signed-off-by: Alessandro Rubini <rubini@gnudd.com>