Cleanup after value_list parsing commit