Factory::sanitizeComponents improved