Ada 2012 -> Ada 2005.
Style fix.
Make sure we don't use implementation specific units.  (Even if 'gnatmake' doesn't test for this 'gnat metric' does.)