Changes based on comments on commit 177f2f3.