Cleanup whitespace in Spree::OrderUpdater.
Simplify update_payment_state code.

Taken from spree/master.