[ci skip] Fix number of methods added by association.

Also clean up some trailing spaces on line 1143-1146.