On Strategy-proofness and the Salience of Single-peakedness