Revert "Elegance."

Don't sacrifice correctness for elegance.