Simple refactor causes us to lift struct definition to top of file.
Signed-off-by: NRusty Russell <rusty@rustcorp.com.au>