Clean up commits 5d54f84cbb4d8fb799fb40e3f8fc1ee94c72b1d6 31ef50c9a2fdb6...

...28b36ace602a6c879f29b258e7 and 4d4f2e9a2ca1cf657f1fd96163531ae3dbbd142c

This cleanup is to enable the move to AL 2.0.  No functional changes at all.