Fixes for my change to pass reference arguments without copying