Using the same Tuple replacement in all builds
replacing negative #ifdef's with positive ones