make scheme.serialize outputs commmon.Span and dependency fix