Fix MethodAndVariableSnakeCase concerning def and self assignments.

Fixes a couple of bugs in regexp matching introduced in #442.