[Success!] [MERGE] Address more comments from Amos.

[Bundle Buggy]

This change has been merged.
Previous status: Semi-approved
For details, see: 
http://bundlebuggy.aaronbentley.com/project/squid/request/%3C200809222346.m8MNkYjC059268%40harfy.jeamland.net%3E
Project: Squid