Thanks for your quick response! I agree that ordering things the same as specified in the options is most natural for users. I am a total Ruby noob—I was happy I managed to fix this bug at all, much less doing it the "right" way—so I will definitely defer to your preference here. As such, feel free to cherry pick + amend + push to master + close the PR. Or would you rather I amend the branch myself with this change? Either way is fine with me!