produce-normalized-schema-map now takes an optional base-schema-definition-map