A few more clean-ups to ConfigCatalog tutorial.