Plugins can now declare columns, too. Two surplus modules removed, their column declararations moved to plugins.