Interconnect: fixed comma at the end of a list.
GCC 4.6 compatibility: work around silly name conflict.