helper/schema: conforms to new API, tests pass