Make generic flag no longer optional.