Various work-arounds and tidy-ups.

Add explicit 'type' attributes -- this seems to be needed as the default_type is not used by gen-json-schema.

Add some missing titles. Reword others.