Make component more in line with other more modern components in preparation for config entry support.