The E2 editor could do with a cleanup - but at the moment I think it makes more sense to be consistent with how we create those buttons, so somebody can easily convert them to a more sensible way at a later date.