Simplify make_table_definition

 * Break it down to two functions ...