@toolness, what do you think about this? I don't think it's a blocker for this PR but it's something to consider for the future.