LGTM but could you split out the non-NFC change (and then you can also mark this whole commit as NFC). I'm just going to accept this module that change.
Can you clang-format and move this into its own patch (it's not really a NFC typo).
Remove incorrect change.
Mark as NFC.
I assume you don't have requested commit access yet (?) so I'm going to land this for you. Thanks for the patch!
I had requested it and got it a short bit ago. Looks like I landed it successfully. Thanks for the review!