Feature parody with rants in DatabaseUtils.
Clean up matcher code.