My development machine, where I ran into this, is still on r41716 (between v15.3 and v16.1). But that revision is well after mid-2014. Maybe I'll get everything moved to 16.1 this weekend and can test it again. Unfortunately, I couldn't come up with a fast way to generate a small test case for this.

-Will