030c886c29
Followups for method call error change Each commit is self-contained. Fixes most of the followup reviews from that PR. r? `@estebank`