'table' has been renamed to 'html_table'
Break bodyNodes into one function per case.

This method is often target of customization which is not possible without
that modularization.
Rebuild containers after import.
Merge branch 'master' into math