Improvements to example matcher sources.