...and if not, I'd love it to be added in separate commit.