RDS/IB: eliminate duplicate code