Agree, but I would like to keep that for a separate commit.
Should we open an issue on subject to follow-up?