Updated to match PR submitted against SpeckCheckout.