## Description

Reduce use of SchemaBuilderInternal.

Fix missing sort when persisting field schema found while editing test
schema: this is not a correctness issue, but should improve consistency
and thus blob reuse in the encoded format.