#4000: fix several 2.x atavisms.
4 files changed