This is the first of a series of mechanical patches made possible by vim
macros. This is a first step towards continuing the work initiated in
39e0bc53 and the first observation is that we have some dead weight
in the table.