Diffusion on stepped surfaces: II. Step attraction and adsorbate-adsorbate repulsion