This work is not delayed.

Also bring the code format in a state which reduces my work to merge
pending sbp2 patchs.
Signed-off-by: NStefan Richter <stefanr@s5r6.in-berlin.de>