Simplified.
More simplifications.