Bug 17698: (follow-up) Fixing things in Comment 57