Fixup, change all subs to method.