Given that the only followup changes were to comments and tests that I confirmed still work locally, I'm inclined to push this without waiting for another round of CI