Converted comp and api (except their tests).
New .isId syntax.