Improved cray if statement. #791