A new form of the Boussinesq equations with improved linear dispersion characteristics. Part 2. A slowly-varying bathymetry