Adding definition lists and improving blank handling.