Handle enumeration more robustly. Numbered OpenDocument formula no longer uses a table for typesetting of formula and it's number. Also some renaming and moving around.