Can SourceIdCodec please implement NumberToShortStringCodec and replace all uses of SourceIdCodec with that.