Changes from scttnlsn's review.