Fixed broken element matcher. (15 test failures.)