38 files changed, 38 insertions, 114 deletions

diff --git a/all_pairs/source/adpcm_dec/adpcm_dec.c b/all_pairs/source/adpcm_dec/adpcm_dec.c
index 368e98d..7994390 100644
--- a/all_pairs/source/adpcm_dec/adpcm_dec.c
+++ b/all_pairs/source/adpcm_dec/adpcm_dec.c
@@ -708,11 +708,9 @@ void _Pragma( "entrypoint" ) adpcm_dec_main( void )
 int main(int argc, char **argv)
 {
   SET_UP
-  for (jobsComplete=0; jobsComplete<maxJobs; jobsComplete++){
-        START_LOOP
+  for_each_job {
         adpcm_dec_init();
         adpcm_dec_main();
-        STOP_LOOP
 }
 WRITE_TO_FILE
   return ( adpcm_dec_return() );
diff --git a/all_pairs/source/adpcm_enc/adpcm_enc.c b/all_pairs/source/adpcm_enc/adpcm_enc.c
index 777aaf5..661bcc6 100644
--- a/all_pairs/source/adpcm_enc/adpcm_enc.c
+++ b/all_pairs/source/adpcm_enc/adpcm_enc.c
@@ -747,11 +747,9 @@ void _Pragma( "entrypoint" ) adpcm_enc_main(void)
 int main(int argc, char **argv)
 {
         SET_UP
-        for(jobsComplete=0; jobsComplete<maxJobs; jobsComplete++){
-                START_LOOP
+        for_each_job {
                 adpcm_enc_init();
                 adpcm_enc_main();
-                STOP_LOOP
         }
         WRITE_TO_FILE
   return adpcm_enc_return();
diff --git a/all_pairs/source/ammunition/ammunition.c b/all_pairs/source/ammunition/ammunition.c
index 052520e..90e89d6 100644
--- a/all_pairs/source/ammunition/ammunition.c
+++ b/all_pairs/source/ammunition/ammunition.c
@@ -1174,11 +1174,9 @@ void _Pragma( "entrypoint" ) ammunition_main( void )
 int main( int argc, char **argv )
 {
         SET_UP
-        for (jobsComplete=0; jobsComplete<maxJobs; jobsComplete++){
-                START_LOOP
+        for_each_job {
                 ammunition_init();
                 ammunition_main();
-                STOP_LOOP
         }
         WRITE_TO_FILE
   return ( ammunition_return() );
diff --git a/all_pairs/source/cjpeg_transupp/cjpeg_transupp.c b/all_pairs/source/cjpeg_transupp/cjpeg_transupp.c
index 5ec7e5e..4a95fe1 100644
--- a/all_pairs/source/cjpeg_transupp/cjpeg_transupp.c
+++ b/all_pairs/source/cjpeg_transupp/cjpeg_transupp.c
@@ -707,11 +707,9 @@ void _Pragma ( "entrypoint" ) cjpeg_transupp_main( void )
 int main(int argc, char **argv)
 {
         SET_UP
-        for (jobsComplete=0; jobsComplete<maxJobs; jobsComplete++){
-                START_LOOP
+        for_each_job {
                 cjpeg_transupp_init();
                 cjpeg_transupp_main();
-                STOP_LOOP
         }
         WRITE_TO_FILE
   return ( cjpeg_transupp_return() - 660 != 0 );
diff --git a/all_pairs/source/cjpeg_wrbmp/cjpeg_wrbmp.c b/all_pairs/source/cjpeg_wrbmp/cjpeg_wrbmp.c
index 3c8d7ec..57daca4 100644
--- a/all_pairs/source/cjpeg_wrbmp/cjpeg_wrbmp.c
+++ b/all_pairs/source/cjpeg_wrbmp/cjpeg_wrbmp.c
@@ -211,11 +211,9 @@ int cjpeg_wrbmp_return()
 int main(int argc, char **argv)
 {
         SET_UP
-        for (jobsComplete=0; jobsComplete<maxJobs; jobsComplete++){
-                START_LOOP
+        for_each_job {
                 cjpeg_wrbmp_init();
                 cjpeg_wrbmp_main();
-                STOP_LOOP
         }
         WRITE_TO_FILE
     return ( cjpeg_wrbmp_return() );
diff --git a/all_pairs/source/dijkstra/dijkstra.c b/all_pairs/source/dijkstra/dijkstra.c
index 333fd43..e9b115e 100644
--- a/all_pairs/source/dijkstra/dijkstra.c
+++ b/all_pairs/source/dijkstra/dijkstra.c
@@ -193,11 +193,9 @@ void _Pragma( "entrypoint" ) dijkstra_main( void )
 int main(int argc, char** argv )
 {
         SET_UP
-        for(jobsComplete=0; jobsComplete<maxJobs; jobsComplete++){
-                START_LOOP
+        for_each_job {
                 dijkstra_init();
                 dijkstra_main();
-                STOP_LOOP
         }
         WRITE_TO_FILE
   return ( dijkstra_return() );
diff --git a/all_pairs/source/epic/epic.c b/all_pairs/source/epic/epic.c
index ed08040..e31e54e 100644
--- a/all_pairs/source/epic/epic.c
+++ b/all_pairs/source/epic/epic.c
@@ -1131,15 +1131,13 @@ int main( int argc, char **argv )
 {
   int exit_code = -1;
   SET_UP
-  for (jobsComplete=0; jobsComplete<maxJobs; jobsComplete++){
-    START_LOOP
+  for_each_job {
     epic_init();
     epic_main();
     // This checks the checksum is as expected.
     // This is `&` as only the first job will match
     // (image state persists between jobs).
     exit_code &= epic_return();
-    STOP_LOOP
   }
   WRITE_TO_FILE
   return exit_code;
diff --git a/all_pairs/source/fmref/fmref.c b/all_pairs/source/fmref/fmref.c
index e4c9aaa..ccd5954 100644
--- a/all_pairs/source/fmref/fmref.c
+++ b/all_pairs/source/fmref/fmref.c
@@ -78,11 +78,9 @@ int fmref_return(void)
 int main(int argc, char **argv){
 
         SET_UP
-        for(jobsComplete=0; jobsComplete<maxJobs; jobsComplete++){
-                START_LOOP
+        for_each_job {
                 fmref_init();
                 fmref_main();
-                STOP_LOOP
         }
         WRITE_TO_FILE
   return fmref_return();
diff --git a/all_pairs/source/gsm_dec/gsm_dec.c b/all_pairs/source/gsm_dec/gsm_dec.c
index ba9a9e9..be6513c 100644
--- a/all_pairs/source/gsm_dec/gsm_dec.c
+++ b/all_pairs/source/gsm_dec/gsm_dec.c
@@ -753,11 +753,9 @@ void _Pragma( "entrypoint" ) gsm_dec_main( void )
 int main( int argc, char **argv)
 {
         SET_UP
-        for (jobsComplete=0; jobsComplete<maxJobs; jobsComplete++){
-                START_LOOP
+        for_each_job {
                 gsm_dec_init();
                 gsm_dec_main();
-                STOP_LOOP
         }
         WRITE_TO_FILE
   return ( gsm_dec_return() );
diff --git a/all_pairs/source/gsm_enc/gsm_enc.c b/all_pairs/source/gsm_enc/gsm_enc.c
index e8154bb..86f062b 100644
--- a/all_pairs/source/gsm_enc/gsm_enc.c
+++ b/all_pairs/source/gsm_enc/gsm_enc.c
@@ -2061,11 +2061,9 @@ void gsm_enc_main( void )
 int main( int argc, char** argv )
 {
         SET_UP
-        for (jobsComplete=0; jobsComplete<maxJobs; jobsComplete++){
-                START_LOOP
+        for_each_job {
                 gsm_enc_init();
                 gsm_enc_main();
-                STOP_LOOP
         }
         WRITE_TO_FILE
   return ( gsm_enc_return() );
diff --git a/all_pairs/source/h264_dec/h264_dec.c b/all_pairs/source/h264_dec/h264_dec.c
index e74bec9..4b1d939 100644
--- a/all_pairs/source/h264_dec/h264_dec.c
+++ b/all_pairs/source/h264_dec/h264_dec.c
@@ -598,11 +598,9 @@ void _Pragma( "entrypoint" )  h264_dec_main( void )
 int main( int argc, char** argv )
 {
         SET_UP
-        for (jobsComplete=0; jobsComplete<maxJobs; jobsComplete++){
-                START_LOOP
+        for_each_job {
                 h264_dec_init();
                 h264_dec_main();
-                STOP_LOOP
         }
         WRITE_TO_FILE
 
diff --git a/all_pairs/source/huff_enc/huff_enc.c b/all_pairs/source/huff_enc/huff_enc.c
index 0d74916..02522aa 100644
--- a/all_pairs/source/huff_enc/huff_enc.c
+++ b/all_pairs/source/huff_enc/huff_enc.c
@@ -578,11 +578,9 @@ void _Pragma( "entrypoint" ) huff_enc_main()
 int main( int argc, char **argv )
 {
         SET_UP
-        for (jobsComplete=0; jobsComplete<maxJobs; jobsComplete++){
-                START_LOOP
+        for_each_job {
                 huff_enc_init();
                 huff_enc_main();
-                STOP_LOOP
         }
         WRITE_TO_FILE
   return ( huff_enc_return() );
diff --git a/all_pairs/source/mpeg2/mpeg2.c b/all_pairs/source/mpeg2/mpeg2.c
index 0567225..cc4c215 100644
--- a/all_pairs/source/mpeg2/mpeg2.c
+++ b/all_pairs/source/mpeg2/mpeg2.c
@@ -13206,11 +13206,9 @@ void _Pragma ( "entrypoint" ) mpeg2_main( void )
 int main( int argc, char **argv )
 {
         SET_UP
-        for (jobsComplete=0; jobsComplete<maxJobs; jobsComplete++){
-                START_LOOP
+        for_each_job {
                 mpeg2_init();
                 mpeg2_main();
-                STOP_LOOP
         }
         WRITE_TO_FILE
 
diff --git a/all_pairs/source/ndes/ndes.c b/all_pairs/source/ndes/ndes.c
index f169c62..b919018 100644
--- a/all_pairs/source/ndes/ndes.c
+++ b/all_pairs/source/ndes/ndes.c
@@ -366,11 +366,9 @@ void _Pragma( "entrypoint" ) ndes_main()
 int main( int argc, char **argv )
 {
         SET_UP
-        for(jobsComplete=0; jobsComplete<maxJobs; jobsComplete++){
-                START_LOOP
+        for_each_job {
                 ndes_init();
                 ndes_main();
-                STOP_LOOP
         }
         WRITE_TO_FILE
 
diff --git a/all_pairs/source/petrinet/petrinet.c b/all_pairs/source/petrinet/petrinet.c
index 6ef3392..79da104 100644
--- a/all_pairs/source/petrinet/petrinet.c
+++ b/all_pairs/source/petrinet/petrinet.c
@@ -977,11 +977,9 @@ int main( int argc, char **argv )
 {
   SET_UP
 
-   for (jobsComplete=0; jobsComplete<maxJobs; jobsComplete++){  
+   for_each_job {
         
-        START_LOOP
         petrinet_main();
-        STOP_LOOP
         }       
         WRITE_TO_FILE
 
diff --git a/all_pairs/source/rijndael_dec/rijndael_dec.c b/all_pairs/source/rijndael_dec/rijndael_dec.c
index 61db767..ccd6a65 100644
--- a/all_pairs/source/rijndael_dec/rijndael_dec.c
+++ b/all_pairs/source/rijndael_dec/rijndael_dec.c
@@ -183,11 +183,9 @@ void _Pragma( "entrypoint" ) rijndael_dec_main( void )
 int main(int argc, char** argv)
 {
         SET_UP
-        for (jobsComplete=0; jobsComplete<maxJobs; jobsComplete++){
-                START_LOOP
+        for_each_job {
                 rijndael_dec_init();
                 rijndael_dec_main();
-                STOP_LOOP
         }
         WRITE_TO_FILE
   return ( rijndael_dec_return() );
diff --git a/all_pairs/source/rijndael_enc/rijndael_enc.c b/all_pairs/source/rijndael_enc/rijndael_enc.c
index 21d7e67..f0582c9 100644
--- a/all_pairs/source/rijndael_enc/rijndael_enc.c
+++ b/all_pairs/source/rijndael_enc/rijndael_enc.c
@@ -228,15 +228,13 @@ int main( int argc, char** argv )
 {
   int exit_code = -1;
   SET_UP
-  for (jobsComplete=0; jobsComplete<maxJobs; jobsComplete++){
-    START_LOOP
+  for_each_job {
     rijndael_enc_init();
     rijndael_enc_main();
     // This checks the checksum is as expected.
     // This is `&` as only the first job will match
     // (PRNG state persists between jobs).
     exit_code &= rijndael_enc_return();
-    STOP_LOOP
   }
   WRITE_TO_FILE
   return ( exit_code );
diff --git a/all_pairs/source/statemate/statemate.c b/all_pairs/source/statemate/statemate.c
index 888d0fa..2b76166 100644
--- a/all_pairs/source/statemate/statemate.c
+++ b/all_pairs/source/statemate/statemate.c
@@ -1274,11 +1274,9 @@ void _Pragma ( "entrypoint" ) statemate_main( void )
 int main ( int argc, char **argv )
 {
         SET_UP
-        for (jobsComplete=0; jobsComplete<maxJobs; jobsComplete++){
-                START_LOOP
+        for_each_job {
                 statemate_init();
                 statemate_main();
-                STOP_LOOP
         }
         WRITE_TO_FILE
 
diff --git a/all_pairs/source/susan/susan.c b/all_pairs/source/susan/susan.c
index dc27fb1..9de5f01 100644
--- a/all_pairs/source/susan/susan.c
+++ b/all_pairs/source/susan/susan.c
@@ -2002,11 +2002,9 @@ int susan_return( void )
 int main( int argc, char **argv )
 {
         SET_UP
-        for (jobsComplete=0; jobsComplete<maxJobs; jobsComplete++){
-                START_LOOP
+        for_each_job {
                 susan_init();
                 susan_main();
-                STOP_LOOP
         }
         WRITE_TO_FILE
 
diff --git a/baseline/source/adpcm_dec/adpcm_dec.c b/baseline/source/adpcm_dec/adpcm_dec.c
index 368e98d..7994390 100644
--- a/baseline/source/adpcm_dec/adpcm_dec.c
+++ b/baseline/source/adpcm_dec/adpcm_dec.c
@@ -708,11 +708,9 @@ void _Pragma( "entrypoint" ) adpcm_dec_main( void )
 int main(int argc, char **argv)
 {
   SET_UP
-  for (jobsComplete=0; jobsComplete<maxJobs; jobsComplete++){
-        START_LOOP
+  for_each_job {
         adpcm_dec_init();
         adpcm_dec_main();
-        STOP_LOOP
 }
 WRITE_TO_FILE
   return ( adpcm_dec_return() );
diff --git a/baseline/source/adpcm_enc/adpcm_enc.c b/baseline/source/adpcm_enc/adpcm_enc.c
index 777aaf5..661bcc6 100644
--- a/baseline/source/adpcm_enc/adpcm_enc.c
+++ b/baseline/source/adpcm_enc/adpcm_enc.c
@@ -747,11 +747,9 @@ void _Pragma( "entrypoint" ) adpcm_enc_main(void)
 int main(int argc, char **argv)
 {
         SET_UP
-        for(jobsComplete=0; jobsComplete<maxJobs; jobsComplete++){
-                START_LOOP
+        for_each_job {
                 adpcm_enc_init();
                 adpcm_enc_main();
-                STOP_LOOP
         }
         WRITE_TO_FILE
   return adpcm_enc_return();
diff --git a/baseline/source/ammunition/ammunition.c b/baseline/source/ammunition/ammunition.c
index 052520e..90e89d6 100644
--- a/baseline/source/ammunition/ammunition.c
+++ b/baseline/source/ammunition/ammunition.c
@@ -1174,11 +1174,9 @@ void _Pragma( "entrypoint" ) ammunition_main( void )
 int main( int argc, char **argv )
 {
         SET_UP
-        for (jobsComplete=0; jobsComplete<maxJobs; jobsComplete++){
-                START_LOOP
+        for_each_job {
                 ammunition_init();
                 ammunition_main();
-                STOP_LOOP
         }
         WRITE_TO_FILE
   return ( ammunition_return() );
diff --git a/baseline/source/cjpeg_transupp/cjpeg_transupp.c b/baseline/source/cjpeg_transupp/cjpeg_transupp.c
index 5ec7e5e..4a95fe1 100644
--- a/baseline/source/cjpeg_transupp/cjpeg_transupp.c
+++ b/baseline/source/cjpeg_transupp/cjpeg_transupp.c
@@ -707,11 +707,9 @@ void _Pragma ( "entrypoint" ) cjpeg_transupp_main( void )
 int main(int argc, char **argv)
 {
         SET_UP
-        for (jobsComplete=0; jobsComplete<maxJobs; jobsComplete++){
-                START_LOOP
+        for_each_job {
                 cjpeg_transupp_init();
                 cjpeg_transupp_main();
-                STOP_LOOP
         }
         WRITE_TO_FILE
   return ( cjpeg_transupp_return() - 660 != 0 );
diff --git a/baseline/source/cjpeg_wrbmp/cjpeg_wrbmp.c b/baseline/source/cjpeg_wrbmp/cjpeg_wrbmp.c
index 3c8d7ec..57daca4 100644
--- a/baseline/source/cjpeg_wrbmp/cjpeg_wrbmp.c
+++ b/baseline/source/cjpeg_wrbmp/cjpeg_wrbmp.c
@@ -211,11 +211,9 @@ int cjpeg_wrbmp_return()
 int main(int argc, char **argv)
 {
         SET_UP
-        for (jobsComplete=0; jobsComplete<maxJobs; jobsComplete++){
-                START_LOOP
+        for_each_job {
                 cjpeg_wrbmp_init();
                 cjpeg_wrbmp_main();
-                STOP_LOOP
         }
         WRITE_TO_FILE
     return ( cjpeg_wrbmp_return() );
diff --git a/baseline/source/dijkstra/dijkstra.c b/baseline/source/dijkstra/dijkstra.c
index 333fd43..e9b115e 100644
--- a/baseline/source/dijkstra/dijkstra.c
+++ b/baseline/source/dijkstra/dijkstra.c
@@ -193,11 +193,9 @@ void _Pragma( "entrypoint" ) dijkstra_main( void )
 int main(int argc, char** argv )
 {
         SET_UP
-        for(jobsComplete=0; jobsComplete<maxJobs; jobsComplete++){
-                START_LOOP
+        for_each_job {
                 dijkstra_init();
                 dijkstra_main();
-                STOP_LOOP
         }
         WRITE_TO_FILE
   return ( dijkstra_return() );
diff --git a/baseline/source/epic/epic.c b/baseline/source/epic/epic.c
index ed08040..e31e54e 100644
--- a/baseline/source/epic/epic.c
+++ b/baseline/source/epic/epic.c
@@ -1131,15 +1131,13 @@ int main( int argc, char **argv )
 {
   int exit_code = -1;
   SET_UP
-  for (jobsComplete=0; jobsComplete<maxJobs; jobsComplete++){
-    START_LOOP
+  for_each_job {
     epic_init();
     epic_main();
     // This checks the checksum is as expected.
     // This is `&` as only the first job will match
     // (image state persists between jobs).
     exit_code &= epic_return();
-    STOP_LOOP
   }
   WRITE_TO_FILE
   return exit_code;
diff --git a/baseline/source/fmref/fmref.c b/baseline/source/fmref/fmref.c
index e4c9aaa..ccd5954 100644
--- a/baseline/source/fmref/fmref.c
+++ b/baseline/source/fmref/fmref.c
@@ -78,11 +78,9 @@ int fmref_return(void)
 int main(int argc, char **argv){
 
         SET_UP
-        for(jobsComplete=0; jobsComplete<maxJobs; jobsComplete++){
-                START_LOOP
+        for_each_job {
                 fmref_init();
                 fmref_main();
-                STOP_LOOP
         }
         WRITE_TO_FILE
   return fmref_return();
diff --git a/baseline/source/gsm_dec/gsm_dec.c b/baseline/source/gsm_dec/gsm_dec.c
index ba9a9e9..be6513c 100644
--- a/baseline/source/gsm_dec/gsm_dec.c
+++ b/baseline/source/gsm_dec/gsm_dec.c
@@ -753,11 +753,9 @@ void _Pragma( "entrypoint" ) gsm_dec_main( void )
 int main( int argc, char **argv)
 {
         SET_UP
-        for (jobsComplete=0; jobsComplete<maxJobs; jobsComplete++){
-                START_LOOP
+        for_each_job {
                 gsm_dec_init();
                 gsm_dec_main();
-                STOP_LOOP
         }
         WRITE_TO_FILE
   return ( gsm_dec_return() );
diff --git a/baseline/source/gsm_enc/gsm_enc.c b/baseline/source/gsm_enc/gsm_enc.c
index e8154bb..86f062b 100644
--- a/baseline/source/gsm_enc/gsm_enc.c
+++ b/baseline/source/gsm_enc/gsm_enc.c
@@ -2061,11 +2061,9 @@ void gsm_enc_main( void )
 int main( int argc, char** argv )
 {
         SET_UP
-        for (jobsComplete=0; jobsComplete<maxJobs; jobsComplete++){
-                START_LOOP
+        for_each_job {
                 gsm_enc_init();
                 gsm_enc_main();
-                STOP_LOOP
         }
         WRITE_TO_FILE
   return ( gsm_enc_return() );
diff --git a/baseline/source/h264_dec/h264_dec.c b/baseline/source/h264_dec/h264_dec.c
index e74bec9..4b1d939 100644
--- a/baseline/source/h264_dec/h264_dec.c
+++ b/baseline/source/h264_dec/h264_dec.c
@@ -598,11 +598,9 @@ void _Pragma( "entrypoint" )  h264_dec_main( void )
 int main( int argc, char** argv )
 {
         SET_UP
-        for (jobsComplete=0; jobsComplete<maxJobs; jobsComplete++){
-                START_LOOP
+        for_each_job {
                 h264_dec_init();
                 h264_dec_main();
-                STOP_LOOP
         }
         WRITE_TO_FILE
 
diff --git a/baseline/source/huff_enc/huff_enc.c b/baseline/source/huff_enc/huff_enc.c
index 0d74916..02522aa 100644
--- a/baseline/source/huff_enc/huff_enc.c
+++ b/baseline/source/huff_enc/huff_enc.c
@@ -578,11 +578,9 @@ void _Pragma( "entrypoint" ) huff_enc_main()
 int main( int argc, char **argv )
 {
         SET_UP
-        for (jobsComplete=0; jobsComplete<maxJobs; jobsComplete++){
-                START_LOOP
+        for_each_job {
                 huff_enc_init();
                 huff_enc_main();
-                STOP_LOOP
         }
         WRITE_TO_FILE
   return ( huff_enc_return() );
diff --git a/baseline/source/mpeg2/mpeg2.c b/baseline/source/mpeg2/mpeg2.c
index 0567225..cc4c215 100644
--- a/baseline/source/mpeg2/mpeg2.c
+++ b/baseline/source/mpeg2/mpeg2.c
@@ -13206,11 +13206,9 @@ void _Pragma ( "entrypoint" ) mpeg2_main( void )
 int main( int argc, char **argv )
 {
         SET_UP
-        for (jobsComplete=0; jobsComplete<maxJobs; jobsComplete++){
-                START_LOOP
+        for_each_job {
                 mpeg2_init();
                 mpeg2_main();
-                STOP_LOOP
         }
         WRITE_TO_FILE
 
diff --git a/baseline/source/ndes/ndes.c b/baseline/source/ndes/ndes.c
index f169c62..b919018 100644
--- a/baseline/source/ndes/ndes.c
+++ b/baseline/source/ndes/ndes.c
@@ -366,11 +366,9 @@ void _Pragma( "entrypoint" ) ndes_main()
 int main( int argc, char **argv )
 {
         SET_UP
-        for(jobsComplete=0; jobsComplete<maxJobs; jobsComplete++){
-                START_LOOP
+        for_each_job {
                 ndes_init();
                 ndes_main();
-                STOP_LOOP
         }
         WRITE_TO_FILE
 
diff --git a/baseline/source/petrinet/petrinet.c b/baseline/source/petrinet/petrinet.c
index 6ef3392..79da104 100644
--- a/baseline/source/petrinet/petrinet.c
+++ b/baseline/source/petrinet/petrinet.c
@@ -977,11 +977,9 @@ int main( int argc, char **argv )
 {
   SET_UP
 
-   for (jobsComplete=0; jobsComplete<maxJobs; jobsComplete++){  
+   for_each_job {
         
-        START_LOOP
         petrinet_main();
-        STOP_LOOP
         }       
         WRITE_TO_FILE
 
diff --git a/baseline/source/rijndael_dec/rijndael_dec.c b/baseline/source/rijndael_dec/rijndael_dec.c
index 61db767..ccd6a65 100644
--- a/baseline/source/rijndael_dec/rijndael_dec.c
+++ b/baseline/source/rijndael_dec/rijndael_dec.c
@@ -183,11 +183,9 @@ void _Pragma( "entrypoint" ) rijndael_dec_main( void )
 int main(int argc, char** argv)
 {
         SET_UP
-        for (jobsComplete=0; jobsComplete<maxJobs; jobsComplete++){
-                START_LOOP
+        for_each_job {
                 rijndael_dec_init();
                 rijndael_dec_main();
-                STOP_LOOP
         }
         WRITE_TO_FILE
   return ( rijndael_dec_return() );
diff --git a/baseline/source/rijndael_enc/rijndael_enc.c b/baseline/source/rijndael_enc/rijndael_enc.c
index 21d7e67..f0582c9 100644
--- a/baseline/source/rijndael_enc/rijndael_enc.c
+++ b/baseline/source/rijndael_enc/rijndael_enc.c
@@ -228,15 +228,13 @@ int main( int argc, char** argv )
 {
   int exit_code = -1;
   SET_UP
-  for (jobsComplete=0; jobsComplete<maxJobs; jobsComplete++){
-    START_LOOP
+  for_each_job {
     rijndael_enc_init();
     rijndael_enc_main();
     // This checks the checksum is as expected.
     // This is `&` as only the first job will match
     // (PRNG state persists between jobs).
     exit_code &= rijndael_enc_return();
-    STOP_LOOP
   }
   WRITE_TO_FILE
   return ( exit_code );
diff --git a/baseline/source/statemate/statemate.c b/baseline/source/statemate/statemate.c
index 888d0fa..2b76166 100644
--- a/baseline/source/statemate/statemate.c
+++ b/baseline/source/statemate/statemate.c
@@ -1274,11 +1274,9 @@ void _Pragma ( "entrypoint" ) statemate_main( void )
 int main ( int argc, char **argv )
 {
         SET_UP
-        for (jobsComplete=0; jobsComplete<maxJobs; jobsComplete++){
-                START_LOOP
+        for_each_job {
                 statemate_init();
                 statemate_main();
-                STOP_LOOP
         }
         WRITE_TO_FILE
 
diff --git a/baseline/source/susan/susan.c b/baseline/source/susan/susan.c
index dc27fb1..9de5f01 100644
--- a/baseline/source/susan/susan.c
+++ b/baseline/source/susan/susan.c
@@ -2002,11 +2002,9 @@ int susan_return( void )
 int main( int argc, char **argv )
 {
         SET_UP
-        for (jobsComplete=0; jobsComplete<maxJobs; jobsComplete++){
-                START_LOOP
+        for_each_job {
                 susan_init();
                 susan_main();
-                STOP_LOOP
         }
         WRITE_TO_FILE