Cleanup quick'n'dirty copy-paste and use valid idl2c references.