Add support for elem namespace unlifing