[UPDATE] move to marking elements as self-closing.