Rework display: function-call rather than table-driven.