More work on converting the existing program to SPARK 2014.