Fix pylint and matcher problems from merge forward

The matcher had been changed a bit in `develop` so the merge forward broke my pillar/compound fixes. This should put them back in working order, and fix the pylint in the process.