Editor review round 4: resolve self/this shenanigans