Fix previously broken xlc checks, simplifying them in the process.