Note the collapse of '+\s*' and the test cases from the spec. Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>