A2.4 (a): Reformulation
A2.4 (b): Cleanup.