This is a preparational patch that just move
two functions and add one (for now unused) function.
Signed-off-by: NSam Ravnborg <sam@ravnborg.org>