CSP: Organizing the table. h/t annevk.