Restore in-line table style and other updates to fix tests
CHANGES.rst now refers to this PR as well