Apply @robdodson PR 12 to improve element-boilerplate