However we still want to make ClassMethods work!

And we'll need to fix codes using the wrong include/prepend
along the way. There were a lot of misuses.