More making copies const&'s