Apply patch from dloverin in FLEX-33701.  Fixes last compiler issue in BasicTests.