Merge "Fix bogus define checks and a typo."