Rule modifications to allow schema inference mostly completed.