Minor simplification of typing, dropping ListItem parameterization from places it does not help