Fix MethodAndVariableSnakeCase concerning def and self assignments.

A couple of bugs in regexp matching.