Some de-uglification in a couple places.