Follow-up r67230 - be consistent in use of IDs rather than classes.