Remove duplicated conversion to lists