On 06/02/2015 09:04 AM, Jason Merrill wrote:
> Ugh, I thought I had dealt with that issue.  Looking...

Fixed thus.