Fix Exercises 11.7, 11.8.

Use trigsimp so that values match expected values.