* Fix table sets handling.
* Simplify formatting.

Suggested by:	luigi