Except in r02275.vtc until the code it refers to stops referring to
subroutines as methods. While I was searching for relevant tests cases
I also broke some long lines.

Refs 17457b48