remove special-case serialization for statements