This might be a regression caused by my editing the file while another change was being merged in parallel.