Good catch of what might be a subtle bug.  Let's file a follow-up issue to investigate after the merge?