Small changes to ItemToggleable.