Re-work match_prefiles a bit due to scrutinizer recommendations