Further attempt at simplification.