Simplification/factoring of table displays throughout.