Standardize `self.method` instead of `class << self` except where necessary
for class method aliasing.
Remove unnecessary subject calls from spec