Other changes to make older Octave release compile again.