Flatten and merge a little.

Signed-off-by: Chris Lamb <chris@chris-lamb.co.uk>