Support for full_span
tidying up