Thanks for the review.  I've attached a new version of the patch which
makes all your suggested changes.

Best regards,
Stefan Kangas