Oxygen, diffuse scattering, and tweed structure in the YBa2Cu3O7-δ system