Though it can be done w/o subclassing, it looks cleaner this way. I went through all of the core files and this is the only class that merits a decorator class. No other classes had method additions. So feel free to review/merge.