Distance dependence and corrugation in barrier-height measurements on metal surfaces