first method2sub changes and regex fixes

This let us run about 9600 more pack tests, which all fail. Still nice
that we day later. Also nice is that we reduce the methods we put in
augmented classes, goal is to get rid of augmenting.