Eliminate one case of mutable reference.  Fix building of test cases.