Fixed bugs preventing 'this' from resolving class type in out-of-class method definitions, more Apollo writing