Pattern matching usage. Diamond operator usage. Remove unused import. isEmpty usage. Original pull request #1912