Fixed $schema normalization; do not modify