Finally got what I think is the last useless #if check. For now.