Several usages of $this when not in object context

This looks great. I added a clean up to the same classes affected here where the project update bot added odd unnecessary things to the constructors.

Thanks for catching this! My bad for not seeing those with the last patch test. Lesson learned not to trust the changes the project update bot makes.

Thanks for this folks!

Automatically closed - issue fixed for 2 weeks with no activity.