Change the restrictions for using self.

Based on in office conversation the use of self to reference the class
has the potential benefit of handling renames in the event that the
class name needs to change. Additionally it makes for easier extraction
into a new class.