Merge in the warning from SPARK-1753