8064ba1 Revert breaking v6.e-ism "are(:Any)" to earlier junction and smartmatch