I agree, and the whole file is repeating the same thing over and over again.

This was just to fix the deprecation. If I get some time, I'll try to remove the repetition.