See #633 ... there don't exist any unit tests for the code that changed here. This is a complex area that we have found tricky to get right. So, let's write some unit tests to make it easier to reason through future changes.