InfoBarGenerics: Slightly streamline the previous commit