
        Minor refactorings for 'data-' attribute logic.