Finish expand_commas