Your question triggers me to think about something else. I will probably file another PR for that.