Fix gather(), which needs specific columns now.