Completing exercises for Chapter 3

Ah, cool.  Next time I'll make more use of it to clean things up a little.