Extend template instantiation bug fix (r184503) with fixit test