(I wish I could edit; I feel I should to clarify, I didn't do any of the Pantheon work, I just noticed the PR a while back and thought of it. I'm not sure I have the skills for that sort of thing yet.)