@njx, it's okay, I just hacked around the few that failed and grabbed them manually.  I will compare my grep check to yours and supply the deprecation code in my next PR.