Fix inconsistently using ifdef