"So, for installations that don't have the email/username difference, the effective code is completely unchanged?"

Exactly.

As for a minimal patch, I'm not well practiced on how to do that. But, you can simply remove the current "connect" method and replace with the contents of the patch file. Then format and fix imports as necessary in your favorite IDE.