#ifdef out some more new constants