SchemaLoader: inline two variables; minor code changes