Add support for more useless nested elements