Allow trailing self in more contexts
#155137
Merged
Loading
self in more contexts
#155137