The only bit failing was the module, so change that before removing the
`span` field.