This commit has no effect on the code, it just move pieces around (ok,
there are a pair of "inline" that are not inline any more).
Signed-off-by: Alessandro Rubini <rubini@gnudd.com>